Reduce use of GtkStyleContext

Remove some unnecessary uses of GtkStyleContext where
we can directly go to the GtkCssStyle, and and drop
unnnecessary includes.

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 074d98d2a3dd76b632a84252b93921ffc941689f..d30dbfb8bf38a8931829a009e467a5c0a2f6c145 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -67,7 +67,6 @@
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 
 

diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c
index 697b06c387024ea1a9e8931b039cf41871cd0d86..642b77bd18cb4237bf7a4c25100a8422247ca998 100644 (file)
--- a/gtk/gtkbuiltinicon.c
+++ b/gtk/gtkbuiltinicon.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkbuiltiniconprivate.h"
 #include "gtkwidgetprivate.h"
@@ -80,10 +80,11 @@ gtk_builtin_icon_measure (GtkWidget      *widget,
                           int            *minimum_baseline,
                           int            *natural_baseline)
 {
-  GtkCssValue *icon_size;
+  GtkCssStyle *style;
 
-  icon_size = _gtk_style_context_peek_property (gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_ICON_SIZE);
-  *minimum = *natural = _gtk_css_number_value_get (icon_size, 100);
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
+
+  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 static void

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 59e43033f4b9b9a7b25a5e0fea37023a6123cebf..7083d157268678e1693e9465554d01cdecbdf5a9 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -103,7 +103,6 @@
 #include "gtkprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturedrag.h"

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 78a53579bb1eb4d6afd1d8b5b4c17c44407da49e..afadecd8411f80ca416f839cfcee66dcb7161f9a 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -35,7 +35,7 @@
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkshortcuttrigger.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkmodelbuttonprivate.h"
 

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index a451fd827f074f55142271d560adf29c3edb88ac..00e9195a990788edca967f0cdbc6e8e721d0919d 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -34,7 +34,6 @@
 #include "gtkpopovermenu.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtknative.h"

diff --git a/gtk/gtkcssinheritvalue.c b/gtk/gtkcssinheritvalue.c
index e17482afb92b01dc62182d79adf223ebd7484686..691e43d2f62281ca3026b08876cc3e3df5568e8a 100644 (file)
--- a/gtk/gtkcssinheritvalue.c
+++ b/gtk/gtkcssinheritvalue.c
@@ -20,7 +20,7 @@
 #include "gtkcssinheritvalueprivate.h"
 
 #include "gtkcssinitialvalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssstyleprivate.h"
 
 struct _GtkCssValue {
   GTK_CSS_VALUE_BASE

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index ebbc1a165a779b8ef42f92984a71db31e5a14f04..7044dd7b03d2f6313d61f152d4bf3b76a7ebcc7f 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -30,7 +30,6 @@
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtksettingsprivate.h"
 #include "gtkstyleprovider.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkstylepropertyprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtkmarshalers.h"

diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index f66d34205f3a6b83430b0ecde6d1423ce08709a3..19314662e32cf81ad066d9502a1e1681018b1f7b 100644 (file)
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -25,7 +25,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtksnapshotprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkpango.h"
 
 #include "gsk/gskcairoblurprivate.h"

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 2626a2ffc7388ea4e9fea7b9821757cd8957f9d8..791886cced79b7e2bd7f5d1d125a2c76ec7a0bdc 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -54,7 +54,6 @@
 #include "gtkprogressbar.h"
 #include "gtksettings.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktextprivate.h"
 #include "gtktexthandleprivate.h"
 #include "gtktextutil.h"

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 16adad8f444bb933c8635727472d5e840250b6f8..d7fb46b4d0fb9f8fda3fe26aadc82f153b0a98d5 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -127,7 +127,6 @@
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 
 #include <string.h>

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 18d4033892eee43a32c637a34fe9540ea8b78643..5674d3cbda30516fad9a5652c16cbe52775bbb45 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -66,7 +66,6 @@
 #include "gtkshow.h"
 #include "gtkmain.h"
 #include "gtkscrollable.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkpopover.h"
 #include "gtkrevealer.h"
 #include "gtkspinner.h"

diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 62b03200497aa4b5143f52018f9f12568ee6057e..3fef81ea55d40788492fec0f40fba8b4177902d1 100644 (file)
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -45,7 +45,6 @@
 #include "gtkscrolledwindow.h"
 #include "gtksearchentry.h"
 #include "gtkspinbutton.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktextview.h"
 #include "gtkwidgetprivate.h"
 #include "gtksettings.h"

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 10b9c818d4112ba2fe2144820ca1e90b3889d79b..25570c76169eccaa01323350da0c45e8a8d60e38 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -31,8 +31,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkwidgetprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtklabel.h"
 
 /**

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 4f8d35492e137878e62d6e582cfd51bfbfe9e8f9..f5909b7f2fc68cbfcf4350b2c72b9994925f7e24 100644 (file)
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -29,7 +29,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 
 

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 54b06396f6d66ef98f13d1775c9ab2d6bee62be1..e4ff62a3c102e525d7bcbcf75fe79b3e2efb8d10 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -26,7 +26,6 @@
 #include "gtkcssenumvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssstyleprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstransientnodeprivate.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkrendericonprivate.h"

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 5c53a5ede1a9138f9518d122a642b36478e42240..4cbc1fd2fa314a19407c49d1c6c040555a94af5b 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -26,7 +26,6 @@
 
 #include "gtkimageprivate.h"
 
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkiconhelperprivate.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index d520fa0e8e3a485d9e54f4191eb68b1722bf70da..389a193bc1bf5d59a10c53cdf10e1aea9c4b9a99 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -28,7 +28,6 @@
 
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerfocus.h"
 #include "gtkgesturedrag.h"

diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index a62968b3f15f7b1226863dde7ece21231472a453..a44ad4a4e12b52072fa13424f4b6a609a66fd0d0 100644 (file)
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -124,13 +124,12 @@
 #include "gtkbinlayout.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkintl.h"
 #include "gtklevelbar.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index ed4f84ad2a787ced065eee52a5722db8a7f3cb43..ccb9ad23a5cb6ac0131640572ee1bbea368ebe56 100644 (file)
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -34,7 +34,6 @@
 #include "gtkscrollable.h"
 #include "gtksingleselection.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index ae38e671a23b37bff2969fc4f5997f4b5f7ad4e8..f5380863bd9d8a05511c12a348fad4633fbb3f17 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -49,7 +49,6 @@
 #include "gtkicontheme.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkdialogprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkmodelbuttonprivate.h"

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index bad99cdddceb0e224dba20bf765028723e1537f9..ac1dbd88fec2295e21f1d17485466b50139dc2f4 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -31,7 +31,6 @@
 #include "gtkboxlayout.h"
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkdroptarget.h"
 #include "gtkdragicon.h"
 #include "gtkdropcontrollermotion.h"

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index fccdacd3c02682e796df88a651a1761debadf1af..c15dab86d9111fa7442940827ce85fcd3a6d0682 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -27,7 +27,6 @@
 #include "gtkpaned.h"
 
 #include "gtkcssboxesprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkgesturepan.h"
 #include "gtkgesturesingle.h"
@@ -37,7 +36,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkrendericonprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssboxesprivate.h"

diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c
index 36b2a187ecde382fcf274c31caa37d9ead1dc1c3..28ea5f24e795f5dc72040aa335166047fc5973be 100644 (file)
--- a/gtk/gtkpasswordentry.c
+++ b/gtk/gtkpasswordentry.c
@@ -35,7 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcsspositionvalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 
 
 /**

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 30a91d447c3321036232260916b500b247aa2666..417c4538a0d31fc846f064062b7caad928cc2ff5 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -27,15 +27,12 @@
 #include "gtkprogressbar.h"
 
 #include "gtkboxlayout.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 
 #include <string.h>

diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c
index 9ea67825734986d5299f91db12c151d98d5dc96d..172f58c4d59f5c3279a3277c84a4ee0527f569e2 100644 (file)
--- a/gtk/gtkroundedbox.c
+++ b/gtk/gtkroundedbox.c
@@ -22,7 +22,6 @@
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtkstylecontextprivate.h"
 
 #include <string.h>
 

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index b4c24903191a6a65c23004222b50f0eec1e04340..4a38c5d2139001307f67929a29c6d5336638d928 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -38,8 +38,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkrangeprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkstylepropertyprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 7ebe279677d48ce6490feb7ebbdc9daa2395b887..88ae86ad974df896eebe5913b9222b11e93a6af2 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -36,7 +36,6 @@
 #include "gtkbox.h"
 #include "gtkbutton.h"
 #include "gtkbuttonprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeditable.h"
 #include "gtkcelleditable.h"
 #include "gtkimage.h"
@@ -53,7 +52,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkboxlayout.h"

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 3cf970eab13612ce9634498dd1cb314e886a6fe5..3784da40edbfd4cf0dfb794170c0704364d2db91 100644 (file)
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -34,7 +34,7 @@
 #include "gtkimage.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkrendericonprivate.h"

diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index cff20c9aa899b5b5d4bc23e5c25776477e5aeb5d..d7a8e3a44bab4c603a30fed7137da556a976c6c0 100644 (file)
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -70,7 +70,6 @@
 #include "gtkprivate.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 
 typedef struct _GtkSwitchClass   GtkSwitchClass;

diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
index 73bd8d5bcc6fa607a527df2e4bd41c9791226fa3..33bbc6bf42057a09052d4f05f26fdfc76a6759f8 100644 (file)
--- a/gtk/gtktexthandle.c
+++ b/gtk/gtktexthandle.c
@@ -26,8 +26,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtkcssboxesimplprivate.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtknativeprivate.h"
 #include "gtkintl.h"
 
@@ -110,17 +109,15 @@ gtk_text_handle_native_get_surface_transform (GtkNative *native,
 
 static void
 gtk_text_handle_get_padding (GtkTextHandle *handle,
-                             GtkBorder     *border)
+                             GtkBorder     *padding)
 {
   GtkWidget *widget = GTK_WIDGET (handle);
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (widget);
+  GtkCssStyle *style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
 
-  border->left = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_LEFT), 100);
-  border->right = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_RIGHT), 100);
-  border->top = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_TOP), 100);
-  border->bottom = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_BOTTOM), 100);
+  padding->left = _gtk_css_number_value_get (style->size->padding_left, 100);
+  padding->right = _gtk_css_number_value_get (style->size->padding_right, 100);
+  padding->top = _gtk_css_number_value_get (style->size->padding_top, 100);
+  padding->bottom = _gtk_css_number_value_get (style->size->padding_bottom, 100);
 }
 
 static void

diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index 3fdb2bc4be5e4b2d2e718be510653fad9e39582c..74b3f5cc5990464738b76d3fbb566e39fe202900 100644 (file)
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -34,7 +34,6 @@
 #include "gtkintl.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssstyleprivate.h"
-#include "gtkstylepropertyprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 
 #define DRAG_ICON_MAX_WIDTH 250
@@ -165,7 +164,6 @@ set_attributes_from_style (GtkWidget         *widget,
                            GtkTextAttributes *values)
 {
   GtkCssStyle *style;
-  GtkStyleContext *context;
   const GdkRGBA black = { 0, };
 
   if (!values->appearance.bg_rgba)
@@ -173,8 +171,7 @@ set_attributes_from_style (GtkWidget         *widget,
   if (!values->appearance.fg_rgba)
     values->appearance.fg_rgba = gdk_rgba_copy (&black);
 
-  context = gtk_widget_get_style_context (widget);
-  style = gtk_style_context_lookup_style (context);
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
 
   *values->appearance.bg_rgba = *gtk_css_color_value_get_rgba (style->background->background_color);
   *values->appearance.fg_rgba = *gtk_css_color_value_get_rgba (style->core->color);

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 5a4ad33e2a0e7563e5909bcad3120386b6622456..6f0bdb18bc2f962625708965723df7cd7e864dc2 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -48,7 +48,7 @@
 #include "gtktypebuiltins.h"
 #include "gtktextviewchildprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtkcssstylepropertyprivate.h"
+#include "gtkstylecontextprivate.h"
 #include "gtkpopover.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
@@ -7491,7 +7491,7 @@ static void
 gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
                                          GtkTextAttributes  *values)
 {
-  GtkStyleContext *context;
+  GtkCssStyle *style;
   const GdkRGBA black = { 0, };
   const GdkRGBA *color;
 
@@ -7500,17 +7500,17 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
   if (!values->appearance.fg_rgba)
     values->appearance.fg_rgba = gdk_rgba_copy (&black);
 
-  context = gtk_widget_get_style_context (GTK_WIDGET (text_view));
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (GTK_WIDGET (text_view)));
 
-  color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR));
+  color = gtk_css_color_value_get_rgba (style->background->background_color);
   *values->appearance.bg_rgba = *color;
-  color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR));
+  color = gtk_css_color_value_get_rgba (style->core->color);
   *values->appearance.fg_rgba = *color;
 
   if (values->font)
     pango_font_description_free (values->font);
 
-  values->font = gtk_css_style_get_pango_font (gtk_style_context_lookup_style (context));
+  values->font = gtk_css_style_get_pango_font (style);
 }
 
 static void

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 267c90b4faeeda011d8a3d05fb32fab33c566449..f6ed73b689c629df6efad3bbef8f6bdaf4fc7650 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -28,7 +28,6 @@
 #include "gtkcellrenderer.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkdragsource.h"
 #include "gtkdragicon.h"
 #include "gtkdroptargetasync.h"

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 52f5833f0e044f3d22a678d20f86dcddf82f8414..3168091367dc8d906c87059a89d506e9ba8624df 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -39,7 +39,6 @@
 #include "gtkcsspositionvalueprivate.h"
 #include "gtkcssfontvariationsvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkcsswidgetnodeprivate.h"
 #include "gtkdebug.h"
 #include "gtkgesturedrag.h"

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 91f6d4698983245e95f3394dddddfc2885de94c1..30f310197acfa33c5afa6961e5b221d7ba3716cc 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -36,7 +36,6 @@
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcssshadowvalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkdroptargetasync.h"
 #include "gtkeventcontrollerlegacy.h"
 #include "gtkeventcontrollerkey.h"